Separate out 3d and 4d combine functions #1243
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #1243 +/- ##
==========================================
+ Coverage 83.36% 83.42% +0.06%
==========================================
Files 35 35
Lines 8826 8858 +32
==========================================
+ Hits 7358 7390 +32
Misses 1468 1468
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For
*_nreductions such asmax_nwe need 3d and 4d versions ofcombinefunctions to support non-categorical aggregations with shape(ny, nx, n)and categorical aggregations with shape(ny, nx, ncat, n). In themainbranch we currently only implement the 4d versions and when we are dealing with non-categorical 3d arrays we insert an extra dimension so that they can be considered to have a single category. This has been fine up until now.Looking forward I am implementing antialiased line support for inspection reductions such as
max_nandwhereand thesecombinefunctions are needed in the antialiased line code. This requires the array dimension changing to occur within numba-jitted functions which isn't really viable as numpy arrays with different dimensions are considered different types innumba. So here the solution is to have separate 3d and 4d numba-jitted functions which iterate over the arrays and call common functions to do the low-level maths.